Enterprise Version
and miscellaneous odds and ends